Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Tue, 19 Jan 2010 10:52:59 +0000 (11:52 +0100)
committerJan D. <jan.h.d@swipnet.se>
Tue, 19 Jan 2010 10:52:59 +0000 (11:52 +0100)
commit6b8f5692d15a46bdbd944491218c90d2031044f0
tree05cee9380156a902e764092af9f456dbeff6a25a
parent3dcf06e70a1792cbd69d8eae5e433352d3962560
parent148d9d3f2cd8ad455c151ebfb50e104be9df4eb1
Merge from trunk